deps include libgtk-x11.la, not libgtk.la (LDADDS): include libgtk-x11.la
authorChristopher Blizzard <blizzard@redhat.com>
Fri, 9 Jun 2000 02:05:17 +0000 (02:05 +0000)
committerChristopher Blizzard <blizzard@src.gnome.org>
Fri, 9 Jun 2000 02:05:17 +0000 (02:05 +0000)
commit40298ef908827fdde7f30a7ee18dd1d6d65c3ae4
tree75c9b56b467e7a500eed91d7f2d1fb21b30d7ce3
parentba0567786bdd5736f8755b8877a3748fe75d0cc5
deps include libgtk-x11.la, not libgtk.la (LDADDS): include libgtk-x11.la

Thu Jun  8 21:54:51 2000 Christopher Blizzard  <blizzard@redhat.com>

* gtk/Makefile.am (DEPS): deps include libgtk-x11.la, not
libgtk.la
(LDADDS): include libgtk-x11.la and libgdk-x11.la, not the non-x11
versions

* gtk/gtklabel.c (gtk_label_get_text): Make sure that the error
checking macros return NULL since the function has a return value.
gtk/Makefile.am
gtk/gtklabel.c